Remove silly assumption about numbers