Update #30 patch #10