Tweaked to remove build block for F18