Fix for issue #262