Fixed Issue #52