fixes requested by M