Bug fix (again)