Fixed mapping issue with multiple views