Fixed #74

Fixed #74