Fixed Bug #43