Small call/return improvement