NextCaller fix for #214