Pre-update of 5.1.2... fix a huge problem!