Committed fix for issue #11