Fixed after Andrew's review