fixes from previous