Fix commit 25a4f5 (again)