Fix for upstream change from ltype -> mtype