Sticky map hotfix