Fixed #37