Fixed Issue #60