Have this fixed for 7.1