Fixes issue #18

The map was incorrect for the mode it was set to.

Can some one test this?