make sure nothing bad happens here
(cherry picked from commit a711dd87b26c358fe320b945ecb26c66d48f54f4)