Fixed noConflict mode