initial fix for issue #242