Fixed KBT#12