resolves SPOT-1754