Fixed #410