fix BicBucStriim issues