hot fix KP
Merge branch 'hot_fix'