Fixed #235