Fixed bug with context variable used in commands