resolves SPOT-1738