Fixed Issue #27