need to fix issue with multiple callbacks