Added fix for issue #218