Fixes a merge issue. ##