Fixed Object Mapper issue for now