CDB-1964 Now found another scenario in after_destroy, fixed too