fixing merged bugs