Correction for bugs 755+756