Fixing mapping (original had some failures)