Closes 159, this time properly.