fixed for F18beta;