correct for 7.6 and warnings