Fixed SCI-1158, stopped infinite loop and tweaked floating point number
matching