Fix for havana PFS