Fixed incomplete MODE support