fixing callbacks

another attempt to fix callbacks