fixes 17july