Fix for issue #119