Probably fixed OMX issues