Attempt to fix the silly FP issue