Fixed a bug with mapping multiple controller mappings correctly