Fixed broken FK stuff