fixed 7.1 and 8.1