fixes from dixon