Use proper id for context. Closes #71.