Closes 683