[Polish] Adjust vars order to fit new version of compass