Fix for issue #280