Fixed Bug #51