Trying to fix FP problem