Changes from comment #10