fix up temp safe check