fixes from dy