Fix for issue #242