Changes to issues 316 and 372