Fixed Issue #53

Fixed Issue #53