resolves SPOT-1756