Fixed nick's merge failure.