Made it safe again; no more tricking the compiler