Fix derivatives (again)