Correct variant for optimizations and FPU

Change-Id: Id7e8d423d8bdb1258ac413cafb803f52c44efba7