Fixed Issue #39