fix BS issues