Fix issue where f2 would be evaluated twice in some cases