#4 #5 both fixed