Fix for issue #19