Fix for when callback is already called