Fix #2024: now supports $position in 2.6