Fixed noConflict