fix problem with context