fixing tracking of different ciphers
fixing tracking of different ciphers