Fixed an old conflict