Changed for Nan error