Variable safety fix.