Fix reopen BS-2412