Kb fix

@johnnyman727 please review & merge