Fixed #301