get rid of some special cases