Fixed trouble with mapping