Fix for issue #258