Common vars fixed