revert change that broke mapping
revert change that broke mapping
Fully fix mapping crash