Should fix the unknown foreign id errors