Plan bug fix