Fixed issue with duplicated remaps