Removed dependency on changing context of the exertleter