Fixed context bug in mappings (bis)