Fix #21

Fixed #21