fix BS-8424