fixed parentMapping handling