potential fix for issue #11