fixes SPOT-1278