Fix for issue #55