Fixed Bug #31