Fixed #1

Fixed #1