Fixed Bug #542