Fix autoplan