no-dommy dev fix up