o Fix for issue #242