sync @ 758, fixes