Not 100% sure of the NaNing bug, my tests were not reporting anything. Hopefully this should be fine.