Fixed Bug #35