Fix mistakes introduced by af07a01e90e3a1c99e4fe2921a6fa7d6d8d61a58