fixing relation mapping