ARQUIDEAS-1360 # To avoid promote problem