Minor change on OnSending addition