data mapping now correctly set. solved bug