Fix for issue #292