Fixed changes Max suggested