Forgot some stuff for issue 1534.