Fixed issue #284