Added compatibility for BKC 1.54