initial fix for issue #11