Experimental relay_safe fix