Issue #11 Fix