Fix base points