Possible fix due to conflicts