fixes duplicaiton in callbacks