Fix for issue #207