Fixed bsa code