resolves SPOT-1808