Fix OF 1.0 per Marco's design