Context translation fix. Closes #5