Made sure that package works in safe mode as well