Fixed Issue #71