fixes SPOT-1272