Same as previous, without two bugs.