Language. Fixes #1 and #2.