Fixed #318