getting rid of nan workaround part 2
getting rid further