Fixing merged problems