Issue #454

Fixed #454