Fix for callback