Room mapper fixed!