Fixed Bug #54