Closes #563