Fixed issue in New Plan