fixed bug - given class ignored when selecting mapper to use