Second fix

Also call the callback if it was provided