Fix for K2 Map