WIP Fixing Norway bug