++ fixes neutron waiting

Change-Id: Ida67c7614e0fe1b1bd88cb7c6c016b9921c453e8