Another fix which was done in a hurry to master :(