Fix weird bug introduced in #437