Fix broken code in commit #866ef6b