SPOT-1675, and fixes another deprication warning