really fixes SPOT-1952, previous commit SPOT-1894