Fixed #451