Fixed BCP bug