better handling of first plan