The generalising in the last commit seemed to be a bit too general and didn't work.