Fixed #58