Fixed Issue #72