Ensure callbacks still work correctly