add some mx check logic (ugly-ish)