7.3 and 10.1 are fixed