Fix for issue #253