Really fixes KBIB-15 (hopefully).