Fixing neutron bug