another try at plan date bug fix