Fixed #469