Removing that mapping warning