resolves SPOT-1742