Fix for failing callback