Fix for issue #155