Fixed Bug #30