Forgot to type Closes #570 in last commit