Following #509 it might be useful to add a test for this being broken in future. Can a test for this be added?
