Context now passes value of custom lock correctly