fix regression on f4. #21