Fixes fkey issue