fixed pojomapping