fixing issue regarding context