Fixed issue #281