Fixed equations and added -fixnan