Fixed #6

Fixed #4