fixed FK mapping