Fixed bug in ClassMapper