Remove position hack