Better implementation of the @autocall