Fixed #230