Fixed Bug #1440