Fixes SPOT-952