fixing mapping closes #1