Fix for issue #283