Change request #347: sakutaro's Oct 10 changes