Fix for gok layout regression