Bug fix after OkC Redesign
2.4.3