Add moar range safety