Adding check 12 changes from Sorin.