Some changes for bug #10