Fixed issue #282