Semi fix for issue #11