Fix for callback to keep it from hanging