minor changes for F18
removed