Fixed Issue #24