Reduce the number of unshorten calls