Issue 745

Fixed #745