Improve the OF operator