Fix rubbish inherited code. I have marked down first year students for this :).