Fix for safeDown