fixes Bug NAN: fake - do not merge