Removed buggy mapping