Moar of the same fix
Merge pull request #22 from AnyFetch/new-api-fix-mappings

Fixed context bug in mappings (bis)