Hack to deal with position shifts