fixing callbacks