Corrections from @eteq and @hamogu