Points for Raymond!
Finally fixing #15