Fix for neutron change deb27d9c24d3745ff062bc437081bd67cf10059f