Fixed #437