Fixed #467