Ensure safe mode is working

Signed-off-by: crynobone <crynobone@gmail.com>
Another fix

Signed-off-by: crynobone <crynobone@gmail.com>