Fixed #2351 (again)