actual SPOT-1955 fix, previous commit was actually for SPOT-2001