Please review my patch as it has fix from comment #65.