minor fix in safe mode