Better fix for no subkey