Merging a fix that was already fixed.