fixed delete issues