fixed issue with context