fixes DELTA-572