Improve handling of purchase call