Fix for better subkey tracking