Fixed Issue #11