fixed for F18beta;
Merge pull request #6 from F1ash/f18/master

fixed for F18beta;