made change to fix mapping