Fix a bug in creating forward map!