Fix for issue #58