Tweaked MODE parsing