Added fix for issue #124