resolves SPOT-1812