Ohai 7 fix