Fixed Safety class