resolves SPOT-1749