Fix for issue #293