added unsafe_no_drop_flag