Fixed main OM constructor