Trying to fix bug with context