fixed scoping for shouldCall