Fix Issue #24