Fix OMX [2/2]