fixed problem attributes mapping