Fixed Issue #21