CLOUD-285 correction in the after method