And removed the bug introduced in the last commit...