CDB-1927 #fixes Adds variables from the back